Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Wed, 12 May 2010 12:17:09 +0000 (12:17 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Wed, 12 May 2010 12:17:09 +0000 (12:17 +0000)
commit6676a497aaf792f0e4bb0a18e7b32959a02c469a
treebe616ffbfdb294c67023f56f7d04d30537045088
parenta47a15c220a7e7ca1d87655640e53e81375fa9a5
parenteafe75b51e63a8a32d30b3ee4f03f9f21d515bfe
Merge from mainline.